GtkSymbolicColor: Add method to resolve to a GdkColor.

diff --git a/gtk/gtkstyleset.h b/gtk/gtkstyleset.h
index 88a11aee3b8f47f345aab376c819f04acca9b3c2..a716edf652ca71582b92705ab78746260644f367 100644 (file)
--- a/gtk/gtkstyleset.h
+++ b/gtk/gtkstyleset.h
@@ -98,6 +98,10 @@ void     gtk_style_set_merge          (GtkStyleSet       *set,
                                        const GtkStyleSet *set_to_merge,
                                        gboolean           replace);
 
+gboolean gtk_symbolic_color_resolve (GtkSymbolicColor    *color,
+                                    GtkStyleSet         *style_set,
+                                     GdkColor            *resolved_color);
+
 G_END_DECLS
 
 #endif /* __GTK_STYLE_PROPERTY_SET_H__ */

diff --git a/gtk/gtksymboliccolor.c b/gtk/gtksymboliccolor.c
index 7a8513d24e13ed783e75a54dbe4c160b61b2865f..bd33efaf6c5aae7625cbef35255273faaa09bc1b 100644 (file)
--- a/gtk/gtksymboliccolor.c
+++ b/gtk/gtksymboliccolor.c
@@ -136,6 +136,73 @@ gtk_symbolic_color_unref (GtkSymbolicColor *color)
   color->ref_count--;
 }
 
+gboolean
+gtk_symbolic_color_resolve (GtkSymbolicColor    *color,
+                            GtkStyleSet         *style_set,
+                            GdkColor            *resolved_color)
+{
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_STYLE_SET (style_set), FALSE);
+  g_return_val_if_fail (resolved_color != NULL, FALSE);
+
+  switch (color->type)
+    {
+    case COLOR_TYPE_LITERAL:
+      *resolved_color = color->color;
+      return TRUE;
+    case COLOR_TYPE_NAME:
+      {
+        GtkSymbolicColor *named_color;
+
+        named_color = gtk_style_set_lookup_color (style_set, color->name);
+
+        if (!named_color)
+          return FALSE;
+
+        return gtk_symbolic_color_resolve (named_color, style_set, resolved_color);
+      }
+
+      break;
+    case COLOR_TYPE_SHADE:
+      {
+        GdkColor shade;
+
+        if (!gtk_symbolic_color_resolve (color->shade.color, style_set, &shade))
+          return FALSE;
+
+        resolved_color->red = CLAMP (shade.red * color->shade.factor, 0, 65535);
+        resolved_color->green = CLAMP (shade.green * color->shade.factor, 0, 65535);
+        resolved_color->blue = CLAMP (shade.blue * color->shade.factor, 0, 65535);
+
+        return TRUE;
+      }
+
+      break;
+    case COLOR_TYPE_MIX:
+      {
+        GdkColor color1, color2;
+
+        if (!gtk_symbolic_color_resolve (color->mix.color1, style_set, &color1))
+          return FALSE;
+
+        if (!gtk_symbolic_color_resolve (color->mix.color2, style_set, &color2))
+          return FALSE;
+
+        resolved_color->red = CLAMP (color1.red + ((color2.red - color1.red) * color->mix.factor), 0, 65535);
+        resolved_color->green = CLAMP (color1.green + ((color2.green - color1.green) * color->mix.factor), 0, 65535);
+        resolved_color->blue = CLAMP (color1.blue + ((color2.blue - color1.blue) * color->mix.factor), 0, 65535);
+
+        return TRUE;
+      }
+
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  return FALSE;
+}
+
 GType
 gtk_symbolic_color_get_type (void)
 {